From 358375391f36f5a004df7ee65bf3c506fd28fd38 Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Mon, 6 Dec 2004 19:16:45 +0000 Subject: [PATCH] bitkeeper revision 1.1159.170.56 (41b4b01dWSU8yr3EZRTsBs0QnHMwxQ) sync w/ head --- .rootkeys | 6 +++--- .../include/linux/irq.h | 0 .../arch/xen/i386/kernel/cpu/mtrr/Makefile | 0 .../arch/xen/i386/kernel/cpu/mtrr/main.c | 0 .../arch/xen/i386/kernel/entry.S | 14 ++++++++------ 5 files changed, 11 insertions(+), 9 deletions(-) rename {linux-2.4.27-xen-sparse => linux-2.4.28-xen-sparse}/include/linux/irq.h (100%) rename {linux-2.6.9-xen-sparse => linux-2.6.10-rc2-xen-sparse}/arch/xen/i386/kernel/cpu/mtrr/Makefile (100%) rename {linux-2.6.9-xen-sparse => linux-2.6.10-rc2-xen-sparse}/arch/xen/i386/kernel/cpu/mtrr/main.c (100%) diff --git a/.rootkeys b/.rootkeys index dcc00d2072..db1ca74926 100644 --- a/.rootkeys +++ b/.rootkeys @@ -44,7 +44,6 @@ 3f815145vGYx1WY79voKkZB9yKwJKQ extras/mini-os/time.c 3f815145xlKBAQmal9oces3G_Mvxqw extras/mini-os/traps.c 4187ca95_eQN62ugV1zliQcfzXrHnw install.sh -419e0488SBzS3mdUhwgsES5a5e3abA linux-2.4.27-xen-sparse/include/linux/irq.h 3e5a4e6589G-U42lFKs43plskXoFxQ linux-2.4.28-xen-sparse/Makefile 3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg linux-2.4.28-xen-sparse/arch/xen/Makefile 3e5a4e65n-KhsEAs-A4ULiStBp-r6w linux-2.4.28-xen-sparse/arch/xen/boot/Makefile @@ -113,6 +112,7 @@ 3f1056a9L_kqHcFheV00KbKBzv9j5w linux-2.4.28-xen-sparse/include/asm-xen/vga.h 40659defgWA92arexpMGn8X3QMDj3w linux-2.4.28-xen-sparse/include/asm-xen/xor.h 3f056927gMHl7mWB89rb73JahbhQIA linux-2.4.28-xen-sparse/include/linux/blk.h +419e0488SBzS3mdUhwgsES5a5e3abA linux-2.4.28-xen-sparse/include/linux/irq.h 4124f66fPHG6yvB_vXmesjvzrJ3yMg linux-2.4.28-xen-sparse/include/linux/mm.h 401c0590D_kwJDU59X8NyvqSv_Cl2A linux-2.4.28-xen-sparse/include/linux/sched.h 40a248afgI0_JKthdYAe8beVfXSTpQ linux-2.4.28-xen-sparse/include/linux/skbuff.h @@ -139,6 +139,8 @@ 40f56238eczveJ86k_4hNxCLRQIF-g linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/Makefile 40f56238rXVTJQKbBuXXLH52qEArcg linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/Makefile 40f562385s4lr6Zg92gExe7UQ4A76Q linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/common.c +41ab440bnpxZdWShZrGgM9pPaz5rmA linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile +41ab440bBKWz-aEOEojU4PAMXe3Ppg linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c 40f56238XDtHSijkAFlbv1PT8Bhw_Q linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/entry.S 40f56238bnvciAuyzAiMkdzGErYt1A linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/head.S 40f58a0d31M2EkuPbG94ns_nOi0PVA linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/i386_ksyms.c @@ -251,8 +253,6 @@ 410a94a4KT6I6X0LVc7djB39tRDp4g linux-2.6.10-rc2-xen-sparse/mm/page_alloc.c 41505c572m-s9ATiO1LiD1GPznTTIg linux-2.6.10-rc2-xen-sparse/net/core/skbuff.c 4149ec79wMpIHdvbntxqVGLRZZjPxw linux-2.6.10-rc2-xen-sparse/net/ipv4/raw.c -41ab440bnpxZdWShZrGgM9pPaz5rmA linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile -41ab440bBKWz-aEOEojU4PAMXe3Ppg linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c 413cb1e4zst25MDYjg63Y-NGC5_pLg netbsd-2.0-xen-sparse/Makefile 413cb1e5c_Mkxf_X0zimEhTKI_l4DA netbsd-2.0-xen-sparse/mkbuildtree 413cb1e5kY_Zil7-b0kI6hvCIxBEYg netbsd-2.0-xen-sparse/nbconfig-xen diff --git a/linux-2.4.27-xen-sparse/include/linux/irq.h b/linux-2.4.28-xen-sparse/include/linux/irq.h similarity index 100% rename from linux-2.4.27-xen-sparse/include/linux/irq.h rename to linux-2.4.28-xen-sparse/include/linux/irq.h diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile b/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile similarity index 100% rename from linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile rename to linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/Makefile diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c b/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c similarity index 100% rename from linux-2.6.9-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c rename to linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/cpu/mtrr/main.c diff --git a/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/entry.S index 708de3a928..a1463c9009 100644 --- a/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/kernel/entry.S @@ -93,7 +93,7 @@ VM_MASK = 0x00020000 #define preempt_stop XEN_BLOCK_EVENTS(%esi) #else #define preempt_stop -#define resume_kernel restore_all_enable_events +#define resume_kernel restore_all #endif #define SAVE_ALL_NO_EVENTMASK \ @@ -109,7 +109,7 @@ VM_MASK = 0x00020000 pushl %ebx; \ movl $(__USER_DS), %edx; \ movl %edx, %ds; \ - movl %edx, %es + movl %edx, %es; #define SAVE_ALL \ SAVE_ALL_NO_EVENTMASK; \ @@ -397,6 +397,7 @@ vector=vector+1 ALIGN common_interrupt: SAVE_ALL + movl %esp,%eax call do_IRQ jmp ret_from_intr @@ -404,7 +405,8 @@ common_interrupt: ENTRY(name) \ pushl $nr-256; \ SAVE_ALL \ - call smp_/**/name; \ + movl %esp,%eax; \ + call smp_/**/name; \ jmp ret_from_intr; /* The include is where all of the SMP etc. interrupts come from */ @@ -437,7 +439,7 @@ error_code: movl %ecx, %es movl %esp,%eax # pt_regs pointer XEN_GET_VCPU_INFO(%esi) - XEN_SAVE_UPCALL_MASK(%esi,%dl,EVENT_MASK+8) + XEN_SAVE_UPCALL_MASK(%esi,%bl,EVENT_MASK) call *%edi jmp ret_from_exception @@ -596,7 +598,7 @@ debug_stack_correct: movl %esp,%eax # pt_regs pointer call do_debug testl %eax,%eax - jnz restore + jnz restore_all jmp ret_from_exception #if 0 /* XEN */ @@ -721,7 +723,7 @@ ENTRY(page_fault) movl %eax, %es movl %esp,%eax /* pt_regs pointer */ XEN_GET_VCPU_INFO(%esi) - XEN_SAVE_UPCALL_MASK(%esi,%bl,EVENT_MASK+12) + XEN_SAVE_UPCALL_MASK(%esi,%bl,EVENT_MASK) call do_page_fault jmp ret_from_exception -- 2.30.2